Update patches

diff --git a/debian/patches/disable-net-tests.patch b/debian/patches/disable-net-tests.patch
index 8f6e8c10b64cb1d53ab76d0994df5244d90843aa..f69e646f8a18d791151326f081d2360e2c28409d 100644 (file)
--- a/debian/patches/disable-net-tests.patch
+++ b/debian/patches/disable-net-tests.patch
@@ -45,7 +45,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
          .file("Cargo.toml", r#"
 --- a/tests/test.rs
 +++ b/tests/test.rs
-@@ -2265,7 +2265,7 @@
+@@ -2194,7 +2194,7 @@
                  execs().with_status(0));
  }
  

diff --git a/debian/patches/use-system-libgit2.patch b/debian/patches/use-system-libgit2.patch
index 35f6d001873ed5181a4560afb1c46575ac4083a0..7169d3f67825d6f6de5e1232af3a997c61d8beff 100644 (file)
--- a/debian/patches/use-system-libgit2.patch
+++ b/debian/patches/use-system-libgit2.patch
@@ -3,8 +3,8 @@ Author: Ximin Luo <infinity0@debian.org>
 Forwarded: not-needed
 ---
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/vendor/libgit2-sys-0.6.6/build.rs
-+++ b/vendor/libgit2-sys-0.6.6/build.rs
+--- a/vendor/libgit2-sys-0.6.12/build.rs
++++ b/vendor/libgit2-sys-0.6.12/build.rs
 @@ -31,10 +31,8 @@
      }
      let has_pkgconfig = Command::new("pkg-config").output().is_ok();
@@ -18,9 +18,3 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
      }
  
      if !Path::new("libgit2/.git").exists() {
---- a/vendor/libgit2-sys-0.6.6/.cargo-checksum.json
-+++ b/vendor/libgit2-sys-0.6.6/.cargo-checksum.json
-@@ -1 +1 @@
--{"files":{".cargo-ok":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","Cargo.toml":"1716bfaf32d1c020e8f4a9220f28d8158feac531408dfc1f66eefae21f3744f4","build.rs":"32f1614473508047c68a95977074c32a41fafb7f08b26f9d5dd937576ecc594f","lib.rs":"427ae51eeab835af5bd1fc26f9b2eaad1f9fd58671ec080eb9def921dcfe2420"},"package":"c7a4e33e9f8b8883c1a5898e72cdc63c00c4f2265283651533b00373094e901c"}
-\ No newline at end of file
-+{"files":{".cargo-ok":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","Cargo.toml":"1716bfaf32d1c020e8f4a9220f28d8158feac531408dfc1f66eefae21f3744f4","build.rs":"7006deca0e11974227326174088500df8f7d1708839378edfd242a11ed7f18c9","lib.rs":"427ae51eeab835af5bd1fc26f9b2eaad1f9fd58671ec080eb9def921dcfe2420"},"package":"c7a4e33e9f8b8883c1a5898e72cdc63c00c4f2265283651533b00373094e901c"}

diff --git a/debian/rules b/debian/rules
index e7a901ecf0145303e12724ec2dbef719872ab177..c1ef37d449ff35aea5ecf59e6607a3f125f49311 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -45,6 +45,7 @@ ifneq ($(filter pkg.cargo.mkstage0,$(DEB_BUILD_PROFILES)),)
 else
        ln -s `which cargo` $(CURDIR)/cargo-stage0
 endif
+       debian/scripts/prune-checksums vendor/libgit2-sys-*/
        # Configure to build cargo using the just-built stage0
        ./configure \
                --prefix=/usr \